Thin and marked build

More